commit a00504d4382d1ae561f4199e9d3bcf65a8045ecd
author Junio C Hamano <gitster@pobox.com> Mon Aug 27 21:11:23 2012
committer Junio C Hamano <gitster@pobox.com> Mon Aug 27 21:11:23 2012
tree 02c2f48bdefba25f947ea52b29fdddda57f18f5d
parent b9dc76c4ad0987d352a0d26620978a14e8f09714

Autogenerated HTML docs for v1.7.12-116-g31e0100 

git-difftool.html

diff --git a/git-difftool.html b/git-difftool.html index cb39324..76ab5e5 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -675,6 +675,23 @@  </p>   </dd>   <dt class="hdlist1">  +--symlinks  +</dt>  +<dt class="hdlist1">  +--no-symlinks  +</dt>  +<dd>  +<p>  + <em>git difftool</em>'s default behavior is create symlinks to the  + working tree when run in <tt>--dir-diff</tt> mode.  +</p>  +<div class="literalblock">  +<div class="content">  +<pre><tt>Specifying `--no-symlinks` instructs 'git difftool' to create  +copies instead. `--no-symlinks` is the default on Windows.</tt></pre>  +</div></div>  +</dd>  +<dt class="hdlist1">   -x &lt;command&gt;   </dt>   <dt class="hdlist1">  @@ -790,7 +807,7 @@  <div id="footnotes"><hr /></div>   <div id="footer">   <div id="footer-text">  -Last updated 2012-05-10 11:44:38 PDT  +Last updated 2012-08-27 14:06:30 PDT   </div>   </div>   </body>